package cn.andthink.alex.Utils.TimeUtil;

<<<<<<< HEAD
import org.joda.time.DateTime;

/**
 * Created by alex.lee on 2015/3/17.
 * 依赖 joda-time [version 2.7]
 */
public class TimeUtil {
	private static DateTime time = new DateTime();

	/**
	 * 获取当前时间
	 *
	 * @param pattern
	 * 		时间格式
	 *
	 * @return 指定格式的时间字符串
	 */
	public static String getTimeNow(String pattern) {
		return time.now().toString(pattern);
	}
=======
/**
 * Created by alex.lee on 2015/3/17.
 */
public class TimeUtil {
>>>>>>> origin/master
}
